a few more replacements of CSTR/CSTRc with qPrintable.

diff --git a/gpsbabel/gdb.cc b/gpsbabel/gdb.cc
index c301a890045eed607fdd13fc69105b1e8993135c..929de7112ab1d86be40bb7737e8d2e6ed67e7c97 100644 (file)
--- a/gpsbabel/gdb.cc
+++ b/gpsbabel/gdb.cc
@@ -688,7 +688,7 @@ read_waypoint(gt_waypt_classes_e* waypt_class_out)
 #if GDB_DEBUG
         DBG(GDB_DBG_WPTe, 1)
         printf(MYNAME "-wpt \"%s\" (%d): url(%d) = %s\n",
-               sn, wpt_class, url_ct - i, CSTR(str));
+               sn, wpt_class, url_ct - i, qPrintable(str));
 #endif
       }
     }

diff --git a/gpsbabel/mmo.cc b/gpsbabel/mmo.cc
index f57ccf3e7f6a97c6c493110817897beb1e6272f2..4beb77aac2fb881ce56a6b74277c7b0dbfa75fe3 100644 (file)
--- a/gpsbabel/mmo.cc
+++ b/gpsbabel/mmo.cc
@@ -540,7 +540,7 @@ mmo_read_CObjWaypoint(mmo_data_t* data)
   if (i != -1) {
     if (icons.contains(i)) {
       wpt->icon_descr = icons.value(i);
-      DBG((sobj, "icon = \"%s\"\n", CSTR(wpt->icon_descr)));
+      DBG((sobj, "icon = \"%s\"\n", qPrintable(wpt->icon_descr)));
     }
 #ifdef MMO_DBG
     else {